master-bc-1793

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