Updated to include changes from the original master

This updates allowEmpty branch to be up-to-date with the original master