Merge branch 'mkoller/atfxadapter' into dev

Change-Id: Ibd25785778afbf8a5a4e3b652a0754c1d88541b7