master-bc-822

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