master-bc-946

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