DOL-98 : Dirty check code and their test cases re-factored.
Merge remote-tracking branch 'origin/master'