merge dynamic sizing into master