Ticket1455 x frame options

See commits