RQF1766211
assigned to @airibarr, @dabadaba, @djuarezg, and @jrische
merged
mentioned in commit 6a381a39