Merge branch 'topic/retrim'