final commit for feb18