MDL-22138 backup - calculated and numericals