master-bc-1061

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