Merge all hotfixes from 3-4-Stable into master branch

ECRT has made several hotfixes that needs to be pulled into the latest. For example the JCI character fix did not make it into 3.5.1.12.