Merge branch 'wip/documentation' into 'master'