[FABRIC-875][FABRIC-876] Fix crypt-xxxx-set commands