I have reviewed your code in the patch,
Can be moved to RTBC++
And Thank you ...