Merged @kuba changes