Merge branch 'consistent-spelling' into 'testing'