Merged latest from master (v1.2.0)