Fix
Merge branch 'master' into journal
Add try conversions
Merge branch 'develop'