LPS-35937 - LPS-35671

Hey Iliyan

Can you take a look at https://github.com/sergiogonzalez/liferay-portal/commit/b0840a458b8ea47c09c899d06743a55112a22e98 and send it to eduardo?

Thanks!