master-bc-3238

https://issues.liferay.com/browse/LIFERAYQA-12661
https://issues.liferay.com/browse/LIFERAYQA-12662