Merge "Refactor!: JJB code comply with updates to v5.x"