added changes for PLUS-1129