Merge branch 'topic/core-id-check' into topic/caiaq