Merge "ART: Fix BCE lint issue"