Merge branch 'gh-pages'
Partial gh-pages to main branch merge