TRUNK-4245: Method uses the same code for two branches
Merge pull request #593 from dszafranek/TRUNK-4245

TRUNK-4245: Method uses the same code for two branches