Merge "aai-common support for v20"