master-bc-1782

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