Merge branch 'mkoller/atfxadapter' into dev

Change-Id: I3d2538f938a6fc677843eee3045f8b8ae66a820e