Merge smartin43 version of the dropdown to submaster.