Merge tonic + some fix