Merge branch 'nogobject-lr1'