[#QUAR-23: repimplemented in interfaces]
Merge branch 'prod' of https://github.com/mxhero/engine into prod