BZ-10486 added dynamic sizing