LPS-40261
LPS-40261 Sort
Merge branch 'master' of github.com:liferay/liferay-portal into LPS-40264