Merge "Fixed minor issue in update script argument handling"