Merged update to use scheme-less srcs from master