Merged latest changes from core project