Merge commit '8e406ba37cb709c05d23d2945be734b3422e923c'
[CLEANUP] visual cleanup of some .ktr
[hi] merged changes from Nikhil Kapoor from infoAxon