Implemented in [d1c9ab]