merge commit 2, generic update