MR!173
MR!174
These changes are adaptations of the changes made on MR!173 and MR!174 from v.14 to v.15, to find more info about these take a look at the MRs added to the RELATED section.