Merge "New handle flip implementation." into devel/master