Merge feature requests

You could also close a "merge from" request, and comment in it prior to close that it's been merged to this request (https://play.giddy.com/feedback/22d35e43-d168-4030-9ed3-a2be642412ad)