Merged manually from kyriakos