Fix/nairi/2.2

http://rb.dcache.org/r/6349/