...
Merge further-1.4 from 1.4.2-SNAPSHOT
Merge master from further-1.4