merged gridlockd (squashed)