Close #66, close #67, close #68, close #69, close #70 and close #71
Merge branch 'enhancement-#66' into develop