merge changes from the last three weeks