+ [OE-4048] bugfixes for rtt changes