[#62657522][#62809656] changes done almost

One query has been asked in gist. If that is over only test cases are
remaining.