Merge branch 'hara_dev' into dev
Merge commit '0b69a43fbba7bb32f45f144c16a308eaa6e9c6e8' into dev