Merge "fix(versal): use only one space for indentation" into integration