DAR-3115 | Fix DAR-3186 and DAR-3187