UCBG-221: Added action.instances=REPLACE
Merge branch 'local_v2.4' into local_v3.2