Merge branch 'syncase-in-boot-9'