Merge branch '274-remove-round' into 'master'