All done, see new commits
Regarding [2] - it's not breaking according to my tests.