Merge branch 'common/mmcif' into rmobile/mmcif