Merge pull request #225 from dejan-brkic/2.4.x

CRAFTERCMS-819
Solves CRAFTERCMS-809
Merge pull request #227 from cortiz/2.4.x

Solves CRAFTERCMS-809