PRD-4747 - Simplication code was buggy as static inherited INSTANCE reference was pointing to the wrong class.
Merge pull request #256 from tmorgner/master

PRD-4747 - Simplication code was buggy as static inherited INSTANCE refe...