merged from release-5-2-2
Creating export to git build