master-bc-1020

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