EB-7806 Special Instructions ---  removing folder
Merge remote-tracking branch 'upstream/master'