The second suggestion has been implemented and merged in
The first suggestion has its own dedicated thread: