Synchronize crime-api branch with master