Merge "Enhance IMS related shell commands to also specify an optional User" into main