merge from jerherrero