Mllr Adaptation - squashed commits