[Reviewer: Alex - Do not merge] Rename handler branch