#254 review comments by Jeremy

2 jobs for 254-post-merge-comments-by-Jeremy in 47 minutes and 3 seconds (queued for 18 seconds)