Code review markups
Merge aio-node-ami into aio-node-ami-mirw