Merge "Edit Functional Menu is not working"