TRUNK-4223: SonarQube - instanceof will always return true
Merge pull request #552 from mszukalski/TRUNK-4223

TRUNK-4223: SonarQube - instanceof will always return true