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