Turns out it is implemented
Merge branches 'master' and 'misc'