merged src changes