Ci3 beta sync with @AdwinTrave

Ci3 beta sync with @AdwinTrave