Pull request 94 lps 30514

See my comment on pull request in portal