Get ready for AMP and fix a deprecated import
Merge branch 'int-index-master'