Merge branch '2211-smol-documentation-fix' into 'develop'