master-bc-1026

https://issues.liferay.com/browse/LIFERAYQA-7242