[IMP] changes related to #1152
[IMP] changes related to #1152

pferreir/indico,indico/indico,pferreir/indico,OmeGak/indico,DirkHoffmann/indico,ThiefMaster/indico,mvidalgarcia/indico,ThiefMaster/indico,mic4ael/indico,mic4ael/indico,pferreir/indico,OmeGak/indico,mic4ael/indico,mvidalgarcia/indico,mvidalgarcia/indico,mic4ael/indico,ThiefMaster/indico,DirkHoffmann/indico,ThiefMaster/indico,DirkHoffmann/indico,indico/indico,OmeGak/indico,pferreir/indico,indico/indico,mvidalgarcia/indico,OmeGak/indico,indico/indico,DirkHoffmann/indico