Optimized the fetch from the post build script
Merge branch 'v3.0'