Merged back revision 12.