#1049106: Fixed iAttribute, code formatted, renamed variables and wrote...

See merge request xrm/basic!141

(cherry picked from commit e3ce1bbb)

3ca02661 #1049106: Fixed iAttribute, code formatted, renamed variables and wrote...