MER-631: Socks

Owned by Grimfeir