master-bc-1021

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