Merge branch 'bb/make-developer-pedantic'