Merge "Fixes to the google review comments + spec 1.1" into klp-dev