Bring Working Branch up to date

Will leave this to be merged by branch owner