Merge "update pom and change aaf config"