[dev v.0.01] manually merge 'fix-commitframe' @ master