carry over changes from live v1.6.x