Changes are done for PLUS 1134