Merged latest changes