daily
0.97AA verstion
0.97AA merge from daily branch