Merge branch 'mkoller/atfxadapter' into dev

Change-Id: I0a536fcf89f65f51334f966135f511f26b24d54e