master-bc-1605

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