Issue 3453 and Issue 3458 - Alignment issues