Allow same page refresh
Merge branch 'master' into MNF