Add fixes to all method.
Add changes.
Fix merge conflicts.
Make modifications.
Fix up where clause.
Fix all method.
Remove unneeded code.
Merge remote-tracking branch 'upstream/master'
Trying to merge 3