Merging latest commits with the original dev_branch

Please review