This is a commit history post qa and dev having merged the hotfix and after resolving conflict