Merge branch 'versatile/fixes' into fixes