Merge pull request #11 from PayBas/ticket/12648

Manually merged conflicts