master-bc-1462

https://issues.liferay.com/browse/LIFERAYQA-3815
https://issues.liferay.com/browse/LIFERAYQA-8369