Fix CMDBOOK-2255 and CMDBOOK-2256