master-bc-3237

https://issues.liferay.com/browse/LIFERAYQA-11150
https://issues.liferay.com/browse/LIFERAYQA-12671