Merge pull request #1714 from Wikia/DAR-2332

DAR-2332 | LazyRail P2 fix