Merge "Add the Release version of PAP as environment variable"