Implemented in 129526d