PUll req: #1370 indicator action menu