Ref #25764 Do not apply serverside spell for master (cherry picked from commit ba7b5d8552d8eea581d33646b184b7b836bf6641)