KON-13 KON-534 Fix
2 files changed