Issue A files added
Merge branch 'issueA' into issueB