master-bc-1417

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