master-bc-1272

https://issues.liferay.com/browse/LIFERAYQA-7907
https://issues.liferay.com/browse/LIFERAYQA-7899