master-bc-1936

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