Typo fixes & rewrite of 'isOperator' and charset.
Merge remote-tracking branch 'origin/master' into pipeline