This is the stable version of base alonf with the module path fixes. Until we cutover to master, only do cherry-picks from stable into master.