master-bc-2041

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