Merge tag 'commons-parent-49'

Tag commons-parent-49 from RC2