Merge "Revert^2 "servicestests and InputTests: allow warnings"" into main