Merge "Add Identity AAA lab, update"