Merge branch 'feature/hex-interface'