Merge "Add deprecation messages." into main