Solves CRAFTERCMS-804
Merge remote-tracking branch 'upstream/2.4.x' into 2.4.x