sync solution info branch with master