Merge Fixes in AllDow305