master-bc-1812

https://issues.liferay.com/browse/LIFERAYQA-9384
https://issues.liferay.com/browse/LIFERAYQA-9407