Merge branch 'petterreinholdtsen-livemon-arfcn' into development