Merge "Improve project distribution-check"