[SD-850] Apiary changes for preferences