stable release

Branch to be released as stable