Merge branch 'master' into Enumeration-Type
fixed merge conflict
fixed merge conflict