Merge branch 'pl061' into devel