Merge "Fixing return type check when expanding via menu."