master-bc-2046

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