Merge pull request #406 from claco/v4.2.3rc

Merged automatically by jenkins after successful build test