Intermediary commit, now based on DeepaMehta 4.1.2