dior0617: CI-181130-swap