master-bc-1464

https://issues.liferay.com/browse/LIFERAYQA-8262
https://issues.liferay.com/browse/LIFERAYQA-8338