Merge branch 'feat/floki-fast-html-2' into 'develop'