master-bc-1853

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