Update to b24
Merge branch 'master' into viewer