CORE-4904, CORE-4906: Corrected number argument '0' and null issues.
Merge branch 'master' into STABLE