master-bc-1946

https://issues.liferay.com/browse/LIFERAYQA-9813
https://issues.liferay.com/browse/LIFERAYQA-9710