Merge remote-tracking branch 'apache/ignite-7016' into ignite-7016