Merge branch 'work/KaoriYa' into KaoriYa