Merge branch 'task/JAL-3594_updated--CHANNEL_cosmetics' into develop