Added requested check. Also takes care of CA-117273