Merge pull request #13 from PayBas/ticket/12654

Manually merged conflicts