Merge "switch to valid aaf url property"