JR692 rollbacked changes except only one