master-bc-2151

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