Rel19

Updates from Master Repo