master-bc-1169

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