master-bc-1824

https://issues.liferay.com/browse/LIFERAYQA-9432
https://issues.liferay.com/browse/LIFERAYQA-9430