Merge branch 'topic/ca0106-resume' into topic/ca0106