Alexei Sorokin 65f1b1e1e3 Fix minor git merge resolving issues %!s(int64=5) %!d(string=hai) anos
..
includes 65f1b1e1e3 Fix minor git merge resolving issues %!s(int64=5) %!d(string=hai) anos
public e1514a151c [DOCUMENTATION][DEVELOPERS][PLUGINS] Some updates to Plugins doc %!s(int64=5) %!d(string=hai) anos