Added more to the guide
Merge branch 'guide' into develop-3.3