LPS-46758 Following new pattern (as in liferay-portal#9b58787)