YH-536: Do not auto-update organization