Bug 987836: Refactor hot deploy marker detection