Merged changes from ocb-web/6.1 revision 2522