master-bc-1993

https://issues.liferay.com/browse/LIFERAYQA-9868
https://issues.liferay.com/browse/LIFERAYQA-9888