BTW: I reused the gist from 96b89f7 , which is the old version of the same patch, which apply to current devel/head, which can be removed with the next devel update.