master-bc-1952

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