FIX: Missing var
v6r12-pre15
Conflicts resolved with rel-v6r12