Bring improvements made into master branch

There were some great improvements on master since last 1.x release, 1.4.2. This PR brings them over :arrow_right_hook: