BugFix PDK-8840