@jhart-r7 commits are accepted and conflicts fixed.