Fix trackster dbkey selection in safari
Merge stable -> default