Merge Master from Development to version 1.2.1