Upgrade to R16B03-1. Work for all branches
Make repeated = true respect mandatory = true