#JC-1599 Assertion removed.
Merge remote-tracking branch 'origin/master'