Feature 585

SEE: Feature_585 on commotion-feed for testing instructions