merged development to UAT v3.0.x
Merge pull request #74 from ke4/58701644_merge_development_branches__v3_x__to_uat

merged development to UAT v3.0.x