master-bc-1480

https://issues.liferay.com/browse/LIFERAYQA-3681
https://issues.liferay.com/browse/LIFERAYQA-8356