master-bc-925

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