Make ActionTest green

this fixed #2116
Merge branch 'Issue2116' into bootstrap