PLFM-2722
Merge branch 'release-40' into develop
Merge pull request #1229 from brucehoff/develop

Develop
Merge pull request #1230 from marcel-blonk/PLFM-2726

use new row selection to delete rows