Merge "Support PostBuildScript 2.x"