master-bc-988

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