Merge "Remember task which is being locked" into nyc-dev