Bugfixes multi-cda (thanks to Gabi Taentzer)

Change-Id: I32012b74c03ba9b6077e4409397458eec99f8038
2 files changed