Forward port 1.2.23 script path changes