[trunk revision 240826]
