master-bc-1413

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