[OE-3268] fixed invalid principal diagnosis post bug
Merge branch 'master' into release/1.4