fix for project feature integration bug
Merge commit '2ff1a98' into projects