build script changes
Merge commit '01a870f8e22f79ca51f6a85851dd52db8585a85d' into HEAD