Merge branch merge-requests/637 for completeness