merge from franCarl