code review comments are applied
synchronization of data object curation and some code review comments applied
fix conflicts