Merge "SPE: Fix feature detection" into integration