+ Jiri revisions fixes from 16.4.2014