master-bc-1451

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