R20Q-U-C R05 rollback

Core boundary was crossed in R04. Rollback is not allowed.