fetus-hina Merge branch 'dev' for v2.74.7