Merge "Fix issue #15689396: pre-installed DemoAPI tests fail..."