MDL-21432 backup - rest of helper files