master-bc-1932

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