MODE-1683 Improved the signatures, JavaDoc and removed an unintentional assert.