Generation of meta file keys happens now earlier.
Merge remote-tracking branch 'origin/master'