master-bc-1025

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