Backport attempt of Workstations into Machines-kind-of layout.