Merge remote-tracking branch 'origin/develop' into DBC-1135
DBC 1135 - Changed functionality.