RUModal now appears in front
Merge branch 'master' into merge-upstream