master-bc-1787

https://issues.liferay.com/browse/LIFERAYQA-9259
https://issues.liferay.com/browse/LIFERAYQA-9403