master-bc-1123

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