SP-986 (backprot of PDI-9989)

*before real commit to files - applied master's checkstyle first to avoid merge conflicts