added platform support guard
merging upstream