Merge "Shell: skip null parameters"