Merge branch 'master' into current_position_marker