Pull req: #1987 added action and test

Fixes #1987