merge with branch "Fawzi"