Bill to amend Rent Restriction Act to be tabled by end of fiscal year