Merge branch 'master' into development
Merge branch 'master' into development
Merge master brach into development branch and resolve conflict.
And few minor changes
Merge branch 'master' into development