Merge "update to use latest portal sdk"