[JIRA-xxx] more changes made by me