Merging v1.4

Pulling latest changes from main repo