Improve flexibility of release scripts Upstream-commit: 80e31df3b6fdf6c1fbd6a5d0aceb0a148066508c Component: engine