#3481
fixed merge for #3481 and #3482
fixed merge for #3481 and #3482
fixed merge for #3481 and #3482
#3483 solved weird conflict