master-bc-1763

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