Merging development branch to master for build 26