master-bc-1390

https://issues.liferay.com/browse/LIFERAYQA-8180
https://issues.liferay.com/browse/LIFERAYQA-8187