Tonic 3.1.4.5 Commit #2