merged latest changes from dev