Merge "Revert Count API module instantiations and Hook runs"