Merge branch '1454-gvdb-corruption' into 'master'