phase2/FLX-1592_feligFLX712_ITkStripsEmu but with phase2/master merged and conflicts resolved.
Closes FLX-1592