US538: Fixed issue with helper above
Merge remote-tracking branch 'origin/development' into development