merge recent changes from master to the test demos
merge