Init Checking - Enc_HotFix2
Merge branch 'Enc_HotFix2' into Dev
ERB_HB - Hot Fix for Encoder Bug