Added in branch
Final commit for issue branch
Merged after resolving conflict