master-bc-1903

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