Merge "Add final crop implementation" into nyc-dev