merge from gh-pages to production for sw2 trigger class change