intelliactive: upstream patches