NOJIRA fix conflicts
Merge branch 'michalfrankl-master'