Merge from llh1/master v1.4.0