Just restored/corrected changes due to merging some things
Merge branch 'fix-merge-conflicts' into dev