merged static branch with master.