Fix/nairi/2.6

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