master-bc-1971

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