merge durka:pref-cleanp