Task 1056 closes #130