*8769* Introducing patch create by Alec
Merge pull request #263 from beghelli/8769-fix

*8769* Introducing patch create by Alec