master-bc-1009

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