master-bc-1010

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