latest step navigator updates
merge