before fourth branch from first local
Squashed commit of the following: