Fix issue
Fix tests
Merge branch 'Issue2278' - Fix for: JS for disabling contribution qn invalid giver/recipient not working