master-bc-2667

https://issues.liferay.com/browse/LIFERAYQA-11517
https://issues.liferay.com/browse/LIFERAYQA-11548