master-bc-1802

https://issues.liferay.com/browse/LIFERAYQA-9278
https://issues.liferay.com/browse/LIFERAYQA-9412