Merged/agordeev/hw