Merge pull request #300 from guardian/AND-3134

AND-3134
Merge branch 'master' into GIA-3239