Merged changes from sprint 86