master-bc-975

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