Merge branch 'blueprint' from controller