Changelog cleanup
Variant generator set wrong inherit values (#914)