Initial commit
Merge commit 'efdcf54b8f52855d3a596ace04fcd302c1c5ea55' into feature/machine-list