Merge "Add markers for new Japanese Era related files"