Added hack fix processor
Merge commit '620f5cf'