master-bc-1694

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