5.1.1, merged changes from branch preferencetabwork