Merge branch 'master' of github.com:ua-eas/katt-kfs-rhubarb
KATTS-2035 merging staging to master