Fixes button misalignment (DT-1115)
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop'