Merge "Support -f option for Current shell command" into main