Merge "version 4.0.6 added extra debug and logging information for more clarity"