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