[#58701644] merged dev 3.0.x to UAT branch
Merge pull request #21 from ke4/58701644_merge_development_branches__v3_x__to_uat

[#58701644] merged dev 3.0.x to UAT branch
All specs passed on Travis.