Refresh lock and baseline post merge-up

Signed-off-by: George Steel <george@net-glue.co.uk>

Author: gsteel