Merge "Add mount callback"