Merge "Run javelin2 check at the end of create"