Merge branch 'features/JAL-3187_uitweaks' into develop