Merge origin/dev into fix/kibitzer-grep-budget