Merge "Using AAF release 2.1.23 dockers"