master-bc-1028

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