* use aliases when they exist * fix hardcoded loop attributes handling (cherry picked from commit 19fee0ef41)
19fee0ef41