master-bc-2936

https://issues.liferay.com/browse/LIFERAYQA-12062
https://issues.liferay.com/browse/LIFERAYQA-12063