🔀 Merge 'feature/sone-locked-notification' into 'next'