master-bc-1448

https://issues.liferay.com/browse/LIFERAYQA-8165
https://issues.liferay.com/browse/LIFERAYQA-7437