- merged most v7.1 changes, somewhat working state