Added enabled/disable to asset defaults, added device property push/pop