6998 - Fallout from the restification of fh-mbaas-express: periodic commit, quite a bit moved around