Added AF changes to master, as Af branch is not working