master-bc-1897

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