PR: 45245 Submitted by: maintainer
synchronization. PR: 36227 Submitted by: Andrew Shevtsov <nyxo@dnuc.polyn.kiae.su>