Updated effected files for fix with notation to indicate what was apart of issue 1730 fix. This was done to make merging code a little easier.