Merge "Revert "Fix SHOW_IMPLICIT and SHOW_EXPLICIT handling"" into udc-qpr-dev