Merge branch 'edge'
Constrain feature photo more