Merge 5-2-stable into master

Created by: bbodenmiller

Contains bug and guide fixes needed in master.