Merge "Support stack on Geard embedded server"