Umerged PR'S - jfmartinz/ResourceHub#1500 SyedImtiyaz-1/GetTechProjects#879 SyedImtiyaz-1/GetTechProjects#935