Merge branch 'mkoller/atfxadapter' into dev

Change-Id: I7b229834006fa5f4e28d19f0aaba62dec07e3608