Merge "Store pending 'history disabled' cmds"