Bringing SJF branch up to Master