Merge branch 'master' into fixed_state