master-bc-990

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