Reimplement the changes made by someone between 2023-12-01 and 2024-02-27 #17

Closed dmitrii-fediuk closed 8 months ago