Merge 'origin/master' into fix-asnotnull to supress new warnings