Merge branch 'topic/adapt'