Reduce code duplication
Fix build
Fix test
Update ChangeLog
Prepare release
Merge branch '1.2'