Merge branch 'topic/bkl' into topic/core-cleanup