BC-1834 #comment fixed by manage shop