Merging v2.1.4 into minor

Merge the changes from master (v.2.1.4) into minor.