Merge branch 'topic/colour.2'