Fix bsc 903069 master