Retirement tax questions

Hi,

We are dealing with the same situation. Did you find a solution to this issue? 

Looks like no one has heard about "Tax cuts and Jobs act" even though there are huge number of articles saying now the 401K loan can be repaid till next  April 15. That is borrower gets 21 months instead of 60 days.