Merge branch 'feature-merklehash' into develop