MB-135 #code consistency