master-bc-1422

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