sync Salem OR updates to master