Add delay to sortable
Merge from master