merge: develop -> fix_stylesheet