Merge "Change template properties for AAI"