Merge "Fix aaa lab"