Merge branch 'topic/ca0106' into to-push