Hotfix/oem 168