Merge "feat(versal): update macro name to generic and move to common place" into integration