merge recent developments