I committed.
Merge branch 'hara_dev' into dev