Merge "Fixing a bug introduced due to refactoring var names"