master-bc-1690

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