Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev