master-bc-1455

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