[trunk revision 211221]
