Implementation of bug 14503
Implementation of bugID 14503
Merge branch 'bugID-14503' into dev