40_13 changes

remerged with phoebus 40_13