Updating GCW local repo release/0.5.0 with NS master for 0.5.0 release