Merge "AAF-892- move the variable to follow rules"