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

This reverts commit 221b5e00d49bc85283da47f1c7b8e6cdb249d851.