P.S.  for emersonveenstra: 
At your convenience and if not too much trouble.. Can you check my discussion started at 

Changeset: 158476611

That will help keep topic and thread relevant for edit I made there.

Thanks in advance. 