master-bc-1972

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