master-bc-1755

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