master-bc-1722

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