master-bc-1419

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