DAR-3045 | bugfixes