master-bc-986

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