master-bc-2613

https://issues.liferay.com/browse/LIFERAYQA-11255
https://issues.liferay.com/browse/LIFERAYQA-11278