Fix empty lines in manifest
Merge branch 'master' into daily
Merge branch 'daily' into next