3rd time afma6 commit