master-bc-1684

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