merged from Stawel