Hotfix for taiha shingeki
Merge branch 'develop'