Work on new features from 1.4.1

See commit messages for details.