master-bc-1367

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