master-bc-979

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