More revisions due to !292 (merged)
requested review from @hoenig
assigned to @holzer
merged
mentioned in commit 354fede8