master-bc-1291

https://issues.liferay.com/browse/LIFERAYQA-7855
https://issues.liferay.com/browse/LIFERAYQA-7867