LPS-33503 SF
LPS-33093 Just a partial backport
LIFERAYQA-4245
LPS-33531
LPS-33531
LPS-33531
LPS-33531
LPS-33531
LPS-33531 source formatting