[BUGFIX beta] Does not disregard currentWhen when given explicitly.
FIxes #4688
Merge pull request #4700 from hyderali/fix-resource-currentwhen

[BUGFIX beta] Does not disregard currentWhen when given explicitly.