Merge Fixes for #1617