#ROBE-79 modified according to RobeView