master-bc-1875

https://issues.liferay.com/browse/LIFERAYQA-3867
https://issues.liferay.com/browse/LIFERAYQA-9623