Merge "Bugfix: Java char is 16 bits, can not be treated as boolean."