Merge branch 'fork/perceptual/master'