Merge "Remove useless KeyFrame if we need" into devel/master