Requested darga/yes on this: https://github.com/ManageIQ/manageiq/pull/13190
Closing this BZ since there were no any requests from clients to backport this changes to 4.1.