Merge "Move sensord"