- Merged from @fprochazka