master-bc-1315

https://issues.liferay.com/browse/LIFERAYQA-5478
https://issues.liferay.com/browse/LIFERAYQA-8015