master-bc-923

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