merging changes done for chunk13 release