master-bc-2675

https://issues.liferay.com/browse/LIFERAYQA-11471
https://issues.liferay.com/browse/LIFERAYQA-11518