Will be merged into the CoreBB repo soon.