MCOP-522 revisit heartbeat defaults

Will rework