m3: Merge branch 'volatile'