Merge branch 'feature/9599_standardize_alg_deprecation_msg' into develop