master-bc-1977

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