Merge pull request #3927 from nutty898/master_nutty_optimizelayout

Master nutty optimizelayout