Fix/3.3/generic portable

Fixes #3313