master-bc-1888

https://issues.liferay.com/browse/LIFERAYQA-9645
https://issues.liferay.com/browse/LIFERAYQA-9651