Merge branch 'integrate-user-guide' into development