Merge "AAF 2.1.23 docker release" into frankfurt