master-bc-2417

https://issues.liferay.com/browse/LIFERAYQA-11051
https://issues.liferay.com/browse/LIFERAYQA-11053