sync with temp_test_v23 (re-included DEVstuff)