dior0617: BJ-180917-swap