Re adding input lenght issue see BT#8688 BT#6509 and #6810