Backport startup links for different memory settings from beta
Fix backport
R-30 changes
R-3.0 changes
Merge branch 'master' into R30