Merge branch 'master' into development

I have fixed the error of duplicate column. Please merge the code.