Merge branch 'topic/earlyfix'