master-bc-1663

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