Added hotfix/RGL-584-44514, XNN-884-92789, feature/SYDDK-135, SYDDK-133