LPS-38663 - Prevent losing Category properties
LPS-38663 - Source formatting
LPS-38663 SF