master-bc-893

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