EB-8020  Replacement Modal  ----- NEW Spinner
Merge remote-tracking branch 'upstream/master'