Merge branches 'patch-2' and 'patch-3' into my-tuning