Fixed replaced
Added classes merge
Merge branch 'master' into 1-4-stable