master-bc-1017

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