master-bc-1697

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