Some erros resolved for CROSSDATA-150
Finish CROSSDATA-150