master-bc-1899

https://issues.liferay.com/browse/LIFERAYQA-9717
https://issues.liferay.com/browse/LIFERAYQA-9709