wrt file changes with ref to Andreas pull request 1308

jira issue: WP-1308

wrt file changes with ref to Andreas pull request 1308 - self resgister