Merge branch 'hotfix-2.0.6'
Change process of saving guides to not use async requests so setTimeout is not necessary.
Merge branch 'hotfix-2.0.7' into development