master-bc-1405

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