I am a bad bad self-merging boy! @trung and @sayyub are just stupid busy and I used this ~ 50 times in production now
mentioned in commit 8a5f6a2f
merged
