Merge pull request #3401 from MartB/modal-heightfixv2