Merge "Fix logback and AAF"