master-bc-797

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