Merge branch 'topic/msbits' into for-next