master-bc-3224

https://issues.liferay.com/browse/LIFERAYQA-12392
https://issues.liferay.com/browse/LIFERAYQA-12611