master-bc-3001

https://issues.liferay.com/browse/LIFERAYQA-12163
https://issues.liferay.com/browse/LIFERAYQA-12187