Merge "Move provider text to body in create / save dialog" into main