Merge branch 'hotfix/docs'
aaaand nope
Revert "aaaand nope"

This reverts commit 029d55f9e52e471c1d3f8f27460cca15aa856480.
aaand nope
Merge branch 'hotfix/undo-docs' into develop