Merge changes from team/russell/sla_reload