Merge "BUG-731: remove unneded temp variables"