First commit of playcon2 branch
--diverge test initated by --amend
Merged ammend with origin, I think