master-bc-6249

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