master-bc-1618

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