Hi,
There is a bugfix release under testing, to be released on thursday, I have added these fixes/features to the nex one after. You can check some parts of the progress on this public board: https://trello.com/b/BUNOEob3/asp
The expected release date of that is 4th of July. Unless there is a major issue, it should be doable.