#9315 - template fixes for updated module
Merge pull request #16 from artur-polcode/9315OgoneUpdate

#9315 - template fixes for updated module