MCOP-522 revisit heartbeat defaults