Sprint task - enhance converter compatibility.
Non-sprint task - javdoc typos fixed.