master-bc-1423

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