Merge branch 'wilc1000-move-out-of-staging'