Respect tenant info from repose

RM7001