Merge "Fix translation between APPLY_RESTRICTION and SOFT_RESTRICTED" into main