merge custom scripts into 1.7 branch