dont write blank values into files, also use bmo
Merge branch 'release/12.0' into release/13.0