Merge "Fix to be testable on TestApp." into main