Merge branch 'hotfix-4.9.8'
Fixed checkout method to not use save!
Merge branch 'hotfix-4.9.9' into develop