Merge "Improvements to MVP: address TODOs to move code to shared module." into main