Merge recent fixes and RECO shell