Tomography - I12 - Fix for attic files
Merge branch '8.34_I12' into 8.34