master-bc-1954

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