Merged to version 9.2

Full update to 9.2 and some additonial improvements.