Resolved and merged now!