master-bc-1219

https://issues.liferay.com/browse/LIFERAYQA-7817
https://issues.liferay.com/browse/LIFERAYQA-7829