More scaffolding support for Raet Salt Caller with Multi master