master-bc-808

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