These are my changes before merging back with the repo
Successfully merged