Feanil/merge release into master