Merge "Add testcase to DynamicSystemClientTest for NPE regression"