Merge remote branch 'origin/qa' into release
bug-fix: bad return check

- check against false on current() checks, not  is_null()
bug-fix: remove throw exception

- see last bug-fix commit
Merge remote branch 'origin/release' into qa