am 1cd0c677: L-MR1 specific fixes

* commit '1cd0c6777f35b531c9ce78397d0915aa521b3e87':
  L-MR1 specific fixes