master-bc-2053

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