LPS-37345

i think this addresses all of the points julio mentioned in https://github.com/juliocamarero/liferay-portal/pull/3092