S bug12
Merge branch 'bug12'
S bug43
S
Merge branch 'bug43'