Merge remote-tracking branch 'origin/dev_tr65_ole_1086_simple_cdd'