master-bc-1931

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