Bcb13 dev

Getting latest changes