Merge branch 'chore/floki-update' into 'develop'