master-bc-1713

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