monke-yo

Results 2 comments of monke-yo

@rekram1-node check #3889

@rekram1-node reused some logic, check again