Closes #1118
Closes #1165

Co-authored-by: Sergey Puchnin <spuchnin@gridgain.com>
Co-authored-by: Taras Ledkov <tledkov@gridgain.com>
Co-authored-by: Oleg Ostanin <oostanin@gridagin.com>