Merge resolution after failed cherry-pick 4532564b48f6b694257a82dc82db18f9cec5491e
Cmdbox updated