master-bc-2952

https://issues.liferay.com/browse/LIFERAYQA-12068
https://issues.liferay.com/browse/LIFERAYQA-12049