Pull in ajps' changes