Base commit - refresh
Merge branch 'confirmable'

Update to master