jiraId:MAR-457 more refactoring
merge