Merge "Update NBI docker for master (Casablanca)"