Merge "Add a deferrable update class for callback/closure udpates"