BISERVER-10553 Subaction component is broken in 5.0
Merge pull request #1076 from mdamour1976/BISERVER-10553-5.0

BISERVER-10553 Subaction component is broken in 5.0