Merge "Temporary remove dump which is causing deadlocks in AM." into tm-dev