This is revision 2 of D9414 that I didn't commit previously.
mentioned in merge request !199 (merged)