LPS-38714

Hey Máté, 

Could you please review this one? It's related to this ticket that you commit http://issues.liferay.com/browse/LPS-30648

Thanks!