Merge DesignPatternTest into hotfixes/patched