Merge branch 'blurhash' into 'develop'