NX-493: Files that were left out from prev commit