Switch back to mainline behave and behaving now my changes have been merged.