roerohan Merge pull request #10 from dyte-in/fix/CAPPS-3168-device-sampling-issue