Some changes for CROSSDATA-153
Finish CROSSDATA-153
Minor changes