Issue LOOP-72 by tj: Changed branch