Merged code changes