master-bc-1644

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