Baze / Chirrut feat

So when are we going to get another chance at this feat since the description was wrong causing most of us to miss out because we only used one or the other like the description said, not both like th...