#Multi-merchant housekeeping

Tagged as #Multi-merchant housekeeping The content is as follows: