master-bc-1989

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