Merge "Updated for Portal sdk 3.4.0 CI jobs for release"