Merge branch 'release/states_clear_screen'