master-bc-1859

https://issues.liferay.com/browse/LIFERAYQA-9544
https://issues.liferay.com/browse/LIFERAYQA-9551