Merged the fix of Revision 302 to the branches