[fix] merge fixes with master