Here are my changes as developer

There are two commits included