Merge Development 1.2.0a to Master