Merge branch 'mkoller/atfxadapter' into dev

Change-Id: I8c7b8a98858770b125137e88a94c7dcf5dd5ef23