final master changes after lp-dev merge