Merge branch 'topic/core-stuff' into topic/atomic-core