Implemented feature described in #3438