Merge branch 'nauhygon-develop' into develop (close #404)