Changes from master v1.2.1