Merge "AiCore reattribute feature" into 24D1-dev