Merge merge-requests/513 - build paths