Merge remote-tracking branch 'remotes/origin/evs_dec_updates' into evs_dec_updates_2