master-bc-1571

https://issues.liferay.com/browse/LIFERAYQA-3740
https://issues.liferay.com/browse/LIFERAYQA-8266