Fix the broken silent mode
Merge branch 'safe-mapping'