Bringing in all sources to  to 0.5.0 release baseline