Merge branches 'input-check-clear', 'listedit', 'rico-bug' and 'rico-db'