master-bc-1290

https://issues.liferay.com/browse/LIFERAYQA-6921
https://issues.liferay.com/browse/LIFERAYQA-7838