Merge branch 'stiabhan-fix-comparisons' into development