Merge dev to master

I think this is a breaking change that we used to checkout the field inside "parameter.Resource", but not we require it on the "parameter"