Merge branch 'strp-generalization'