Merge pull request #10423 from cotequeiroz/afalg_engine