some syntax fix + config modifications
Merge remote branch 'halaszk/master-3.0.31' into master-3.0.31