Merge "Split core_current into separate module specific APIs"