master-bc-1101

https://issues.liferay.com/browse/LIFERAYQA-7567
https://issues.liferay.com/browse/LIFERAYQA-7592