Merge "Removed critical code smell"