updated help
Merge branch 'release/1.36'