Updating the source plugin to 2.4
Merge remote-tracking branch 'origin/develop' into develop