manual local merge to stable/icehouse