Merge "[COMMON] Fix sourced script with arguments bashism"