Merge: Tobin bug fixing