I created XD-1283 for that explicitly