Done here: https://github.com/forge/core/pull/318